# This is a BitKeeper generated patch for the following project:
# Project Name: Linux kernel tree
# This patch format is intended for GNU patch command version 2.5 or higher.
# This patch includes the following deltas:
#	           ChangeSet	1.1069.257.7 -> 1.1069.257.8
#	drivers/acpi/system.c	1.17.1.2 -> 1.17.1.3
#
# The following is the BitKeeper ChangeSet Log
# --------------------------------------------
# 04/03/08	bjorn.helgaas@hp.com	1.1177
# Merge hp.com:/home/helgaas/linux/to-marcelo-2.4
# into hp.com:/home/helgaas/linux/linux-ia64-2.4
# --------------------------------------------
# 04/03/08	bjorn.helgaas@hp.com	1.1178
# Merge hp.com:/home/helgaas/linux/ia64-extras
# into hp.com:/home/helgaas/linux/linux-ia64-2.4
# --------------------------------------------
# 04/03/08	bjorn.helgaas@hp.com	1.1069.257.8
# Cset exclude: bjorn.helgaas@hp.com|ChangeSet|20040303223612|45191
# --------------------------------------------
#
diff -Nru a/drivers/acpi/system.c b/drivers/acpi/system.c
--- a/drivers/acpi/system.c	Mon Mar  8 15:51:45 2004
+++ b/drivers/acpi/system.c	Mon Mar  8 15:51:45 2004
@@ -364,15 +364,6 @@
 	return status;
 }
 
-#else
-
-acpi_status
-acpi_system_save_state(
-	u32			state)
-{
-	return AE_OK;
-}
-
 #endif /* CONFIG_ACPI_SLEEP */